From 5debbb081aefe65e9391dc64742181cb4121d769 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Fri, 25 Nov 2016 23:50:10 +0000
Subject: [PATCH] quilt: update patches for 0.15.0~dev

---
 debian/patches/deps-adjust-versions.patch |  95 -------------------
 debian/patches/deps-adjust.patch          | 106 ++++++++++++++++++++++
 debian/patches/libgit2-fixes.patch        |  13 ---
 debian/patches/series                     |   3 +-
 4 files changed, 107 insertions(+), 110 deletions(-)
 delete mode 100644 debian/patches/deps-adjust-versions.patch
 create mode 100644 debian/patches/deps-adjust.patch
 delete mode 100644 debian/patches/libgit2-fixes.patch

diff --git a/debian/patches/deps-adjust-versions.patch b/debian/patches/deps-adjust-versions.patch
deleted file mode 100644
index 456462608..000000000
--- a/debian/patches/deps-adjust-versions.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Luca Bruno <lucab@debian.org>
-Description: Adjust deps dependencies
- This is a workaround for bugs in the embedding script
-Forwarded: not-needed
-Index: cargo/deps/flate2-0.2.13/Cargo.toml
-===================================================================
---- cargo.orig/deps/flate2-0.2.13/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-+++ cargo/deps/flate2-0.2.13/Cargo.toml	2016-08-14 21:49:43.797702736 +0000
-@@ -17,12 +17,12 @@
- 
- [dependencies]
- libc = "0.2"
--miniz-sys = { path = "miniz-sys", version = "0.1.7", optional = true }
-+miniz-sys = { path = "miniz-sys", version = "0.1.7" }
- libz-sys = { version = "1.0", optional = true }
- 
- [dev-dependencies]
- rand = "0.3"
- 
- [features]
--default = ["miniz-sys"]
-+default = []
- zlib = ["libz-sys"]
-Index: cargo/deps/log-0.3.5/Cargo.toml
-===================================================================
---- cargo.orig/deps/log-0.3.5/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-+++ cargo/deps/log-0.3.5/Cargo.toml	2016-08-14 21:49:43.797702736 +0000
-@@ -17,7 +17,7 @@
- harness = false
- 
- [dependencies]
--libc = {version = "0.2", optional = true}
-+libc = {version = "0.2" }
- 
- [features]
- max_level_off   = []
-@@ -35,5 +35,5 @@
- release_max_level_trace = []
- 
- nightly = []
--use_std = ["libc"]
-+use_std = []
- default = ["use_std"]
-Index: cargo/deps/semver-0.2.3/Cargo.toml
-===================================================================
---- cargo.orig/deps/semver-0.2.3/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-+++ cargo/deps/semver-0.2.3/Cargo.toml	2016-08-14 21:49:43.797702736 +0000
-@@ -12,7 +12,7 @@
- """
- 
- [dependencies]
--nom = "1.0.1"
-+nom = "1.2.0"
- 
- [features]
- default = []
-Index: cargo/deps/git2-0.4.3/Cargo.toml
-===================================================================
---- cargo.orig/deps/git2-0.4.3/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-+++ cargo/deps/git2-0.4.3/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-@@ -16,7 +16,7 @@
- """
- 
- [dependencies]
--url = "1.0"
-+url = "1.1.0"
- bitflags = "0.1"
- libc = "0.2"
- libgit2-sys = { path = "libgit2-sys", version = "0.4.3" }
-Index: cargo/deps/curl-0.2.19/Cargo.toml
-===================================================================
---- cargo.orig/deps/curl-0.2.19/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-+++ cargo/deps/curl-0.2.19/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-@@ -8,7 +8,7 @@
- description = "Rust bindings to libcurl for making HTTP requests"
- 
- [dependencies]
--url = ">= 0.5, < 2.0"
-+url = "1.1.0"
- log = "0.3.0"
- libc = "0.2"
- curl-sys = { path = "curl-sys", version = "0.1.0" }
-Index: cargo/deps/git2-curl-0.4.1/Cargo.toml
-===================================================================
---- cargo.orig/deps/git2-curl-0.4.1/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-+++ cargo/deps/git2-curl-0.4.1/Cargo.toml	2016-08-14 21:49:43.801702645 +0000
-@@ -15,7 +15,7 @@
- 
- [dependencies]
- curl = "0.2"
--url = "1.0"
-+url = "1.1.0"
- log = "0.3"
- git2 = { path = "..", version = "0.4" }
- 
diff --git a/debian/patches/deps-adjust.patch b/debian/patches/deps-adjust.patch
new file mode 100644
index 000000000..0c3da2d8c
--- /dev/null
+++ b/debian/patches/deps-adjust.patch
@@ -0,0 +1,106 @@
+From: Luca Bruno <lucab@debian.org>
+Description: Adjust deps dependencies
+ This is a workaround for bugs in the embedding script
+Forwarded: not-needed
+
+Index: cargo/deps/tar-0.4.8/Cargo.toml
+===================================================================
+--- cargo.orig/deps/tar-0.4.8/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
++++ cargo/deps/tar-0.4.8/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
+@@ -23,9 +23,3 @@
+ 
+ [dev-dependencies]
+ tempdir = "0.3"
+-
+-[target."cfg(unix)".dependencies]
+-xattr = { version = "0.1.7", optional = true }
+-
+-[features]
+-default = ["xattr"]
+Index: cargo/deps/libgit2-sys-0.6.2/Cargo.toml
+===================================================================
+--- cargo.orig/deps/libgit2-sys-0.6.2/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
++++ cargo/deps/libgit2-sys-0.6.2/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
+@@ -18,15 +18,13 @@
+ libc = "0.2"
+ libssh2-sys = { version = "0.2", optional = true }
+ libz-sys = ">= 0"
++openssl-sys = { version = "0.9", optional = true }
+ 
+ [build-dependencies]
+ pkg-config = "0.3"
+ cmake = "0.1.2"
+ gcc = "0.3"
+ 
+-[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
+-openssl-sys = { version = "0.9", optional = true }
+-
+ [features]
+ ssh = ["libssh2-sys"]
+ https = ["openssl-sys"]
+Index: cargo/deps/git2-0.6.0/Cargo.toml
+===================================================================
+--- cargo.orig/deps/git2-0.6.0/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
++++ cargo/deps/git2-0.6.0/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
+@@ -20,8 +20,6 @@
+ bitflags = "0.7"
+ libc = "0.2"
+ libgit2-sys = { path = "libgit2-sys", version = "0.6.0" }
+-
+-[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
+ openssl-sys = { version = "0.9.0", optional = true }
+ openssl-probe = { version = "0.1", optional = true }
+ 
+Index: cargo/deps/fs2-0.3.0/Cargo.toml
+===================================================================
+--- cargo.orig/deps/fs2-0.3.0/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
++++ cargo/deps/fs2-0.3.0/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
+@@ -8,7 +8,7 @@
+ description = "Cross-platform file locks and file duplication."
+ keywords = ["file", "file-system", "lock", "duplicate", "flock"]
+ 
+-[target.'cfg(unix)'.dependencies]
++[dependencies]
+ libc = "0.2.2"
+ 
+ [target.'cfg(windows)'.dependencies]
+Index: cargo/deps/libssh2-sys-0.2.3/Cargo.toml
+===================================================================
+--- cargo.orig/deps/libssh2-sys-0.2.3/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
++++ cargo/deps/libssh2-sys-0.2.3/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
+@@ -15,8 +15,6 @@
+ [dependencies]
+ libz-sys = ">= 0"
+ libc = "0.2"
+-
+-[target."cfg(unix)".dependencies]
+ openssl-sys = "0.9"
+ 
+ [build-dependencies]
+Index: cargo/deps/curl-sys-0.3.4/Cargo.toml
+===================================================================
+--- cargo.orig/deps/curl-sys-0.3.4/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
++++ cargo/deps/curl-sys-0.3.4/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
+@@ -20,8 +20,6 @@
+ [dependencies]
+ libz-sys = ">= 0"
+ libc = "0.2"
+-
+-[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
+ openssl-sys = "0.9"
+ 
+ [target."cfg(windows)".dependencies]
+Index: cargo/deps/curl-0.4.1/Cargo.toml
+===================================================================
+--- cargo.orig/deps/curl-0.4.1/Cargo.toml	2016-11-11 15:37:52.000000000 +0000
++++ cargo/deps/curl-0.4.1/Cargo.toml	2016-11-26 00:29:52.800169929 +0000
+@@ -11,9 +11,6 @@
+ [dependencies]
+ libc = "0.2"
+ curl-sys = { path = "curl-sys", version = "0.3" }
+-
+-# Unix platforms use OpenSSL for now to provide SSL functionality
+-[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
+ openssl-sys = "0.9.0"
+ openssl-probe = "0.1"
+ 
diff --git a/debian/patches/libgit2-fixes.patch b/debian/patches/libgit2-fixes.patch
deleted file mode 100644
index 73e6c7479..000000000
--- a/debian/patches/libgit2-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fromm: Luca Bruno <lucab@debian.org>
-Description: Misc fixes to build libgit2-sys
-Forwarded: not-needed
---- a/deps/libgit2-sys-0.4.3/build.rs
-+++ b/deps/libgit2-sys-0.4.3/build.rs
-@@ -102,7 +102,6 @@
-         cfg.define("USE_OPENSSL", "OFF");
-     }
- 
--    let _ = fs::remove_dir_all(env::var("OUT_DIR").unwrap());
-     t!(fs::create_dir_all(env::var("OUT_DIR").unwrap()));
- 
-     let dst = cfg.define("BUILD_SHARED_LIBS", "OFF")
diff --git a/debian/patches/series b/debian/patches/series
index da4651bed..91f55488e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 clean-cargo-deps.patch
-deps-adjust-versions.patch
-libgit2-fixes.patch
+deps-adjust.patch
 local-jquery.patch
-- 
2.30.2